widget: Use G_ENABLE_CONSISTENCY_CHECKS for invariants checking
authorMatthias Clasen <mclasen@redhat.com>
Wed, 9 Sep 2015 01:08:20 +0000 (21:08 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 9 Sep 2015 10:32:46 +0000 (06:32 -0400)
The logic here is that G_ENABLE_DEBUG is for compiling out
debug spew that can be triggered at runtime with the GTK_DEBUG
environment variable, while G_ENABLE_CONSISTENCY_CHECKS is for
consistency checks that are applied unconditionally.

gtk/gtkwidget.c

index 3b00c8190fa43b1cf7a252f76ada518b7f49d209..eef2a14937265fd5c65d5424c0a16538e6a70a94 100644 (file)
@@ -685,7 +685,7 @@ static void             gtk_widget_real_move_focus              (GtkWidget
                                                                  GtkDirectionType  direction);
 static gboolean                gtk_widget_real_keynav_failed           (GtkWidget        *widget,
                                                                 GtkDirectionType  direction);
-#ifdef G_ENABLE_DEBUG
+#ifdef G_ENABLE_CONSISTENCY_CHECKS
 static void             gtk_widget_verify_invariants            (GtkWidget        *widget);
 static void             gtk_widget_push_verify_invariants       (GtkWidget        *widget);
 static void             gtk_widget_pop_verify_invariants        (GtkWidget        *widget);
@@ -9944,7 +9944,7 @@ gtk_widget_reset_style (GtkWidget *widget)
                   (GFunc) reset_style_recurse, NULL);
 }
 
-#ifdef G_ENABLE_DEBUG
+#ifdef G_ENABLE_CONSISTENCY_CHECKS
 
 /* Verify invariants, see docs/widget_system.txt for notes on much of
  * this.  Invariants may be temporarily broken while we’re in the
@@ -10124,7 +10124,7 @@ gtk_widget_pop_verify_invariants (GtkWidget *widget)
         }
     }
 }
-#endif /* G_ENABLE_DEBUG */
+#endif /* G_ENABLE_CONSISTENCY_CHECKS */
 
 static PangoContext *
 gtk_widget_peek_pango_context (GtkWidget *widget)